From: Chong Yidong <cyd@stupidchicken.com>
Date: Fri, 15 Jun 2007 00:02:03 +0000 (+0000)
Subject: (update_compositions): Fix last fix.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~18362
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=2257e69e1ced2decbfa0666c7396ab9e4b85cb90;p=emacs.git

(update_compositions): Fix last fix.
---

diff --git a/src/composite.c b/src/composite.c
index 4e6c08a65cc..b0a5ebbc3ee 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -512,7 +512,7 @@ update_compositions (from, to, check_mask)
 	}
       else if (from < ZV
 	       && find_composition (from, -1, &start, &from, &prop, Qnil)
-	       && COMPOSITION_VALID_P (start, end, prop))
+	       && COMPOSITION_VALID_P (start, from, prop))
 	run_composition_function (start, from, prop);
     }
 
@@ -523,7 +523,7 @@ update_compositions (from, to, check_mask)
          (to - 1).  */
       while (from < to - 1
 	     && find_composition (from, to, &start, &from, &prop, Qnil)
-	     && COMPOSITION_VALID_P (start, end, prop)
+	     && COMPOSITION_VALID_P (start, from, prop)
 	     && from < to - 1)
 	run_composition_function (start, from, prop);
     }